Submodules: Don't parse .gitmodules when it contains, merge conflicts

[git/debian.git] / t / t4135 / diff-with quote.diff

--- "postimage".txt.orig        2010-08-18 20:13:31.744002255 -0500
+++ "postimage".txt     2010-08-18 20:13:31.744002255 -0500
@@ -1 +1 @@
-preimage
+postimage